From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 3 Jul 2011 12:33:37 +0000 (+0200)
Subject: * functions.texi (What Is a Function): Document the autoload
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3143
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5d9b573c2604fd3295a80c689b26f180d8776d81;p=emacs.git

* functions.texi (What Is a Function): Document the autoload
object.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d2d3051c333..703a3780687 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* functions.texi (What Is a Function): Document the autoload
+	object (bug#6496).
+
 2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* customize.texi (Variable Definitions): Clarify that SETFUNCTION
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 974487382c8..519957f8921 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -112,6 +112,13 @@ editors; for Lisp programs, the distinction is normally unimportant.
 @item byte-code function
 A @dfn{byte-code function} is a function that has been compiled by the
 byte compiler.  @xref{Byte-Code Type}.
+
+@item autoload object
+@cindex autoload object
+An @dfn{autoload object} is a place-holder for a real function.  If
+the autoload object is called, it will make Emacs load the file
+containing the definition of the real function, and then call the real
+function instead.
 @end table
 
 @defun functionp object